bors [Fri, 19 Dec 2014 21:45:29 +0000 (21:45 +0000)]
auto merge of #1067 : alexcrichton/cargo/fix-registry-update, r=alexcrichton
If a registry already knew about a package, but didn't know about newly
published version of a package, then the registry would occasionally not be
updated when it otherwise needed to be.
Alex Crichton [Fri, 19 Dec 2014 21:43:21 +0000 (13:43 -0800)]
Fix cases where a registry is not updated
If a registry already knew about a package, but didn't know about newly
published version of a package, then the registry would occasionally not be
updated when it otherwise needed to be.
bors [Fri, 19 Dec 2014 16:28:44 +0000 (16:28 +0000)]
auto merge of #1064 : alexcrichton/cargo/snapshots, r=alexcrichton
Should fix the mac bots
Alex Crichton [Fri, 19 Dec 2014 07:03:06 +0000 (23:03 -0800)]
Register new snapshots
Should fix the mac bots
bors [Thu, 18 Dec 2014 17:13:45 +0000 (17:13 +0000)]
auto merge of #1045 : alexcrichton/cargo/update-git2, r=alexcrichton
Should fix #1032 and #1029
Alex Crichton [Fri, 12 Dec 2014 22:44:41 +0000 (14:44 -0800)]
Update git2 and cargo snapshots
Should fix #1032 and #1029
bors [Thu, 18 Dec 2014 01:50:48 +0000 (01:50 +0000)]
auto merge of #1060 : alexcrichton/cargo/pr-1012, r=alexcrichton
Alex Crichton [Thu, 18 Dec 2014 00:32:20 +0000 (16:32 -0800)]
Add a test for PR #1012
Alex Crichton [Thu, 18 Dec 2014 00:09:33 +0000 (16:09 -0800)]
Merge branch 'fix-custom-build-cross' of https://github.com/jmesmon/cargo into pr-1012
bors [Tue, 16 Dec 2014 17:28:49 +0000 (17:28 +0000)]
auto merge of #1057 : alexcrichton/cargo/fix-nightly, r=brson
Older versions of curl apparently don't peel off the query parameters when
looking up filenames, so make two copies of the search results file in hope that
curl will find one of them!
Alex Crichton [Tue, 16 Dec 2014 17:18:40 +0000 (09:18 -0800)]
Fix mac nightly builds
Older versions of curl apparently don't peel off the query parameters when
looking up filenames, so make two copies of the search results file in hope that
curl will find one of them!
bors [Tue, 16 Dec 2014 16:13:50 +0000 (16:13 +0000)]
auto merge of #1053 : sfackler/cargo/master, r=alexcrichton
It's really hard to find out any information about a project if it
doesn't have any of these.
As a bonus I added a shebang to .travis.install.deps.sh so the README
instructions actually work.
Closes #998
Steven Fackler [Mon, 15 Dec 2014 04:43:38 +0000 (20:43 -0800)]
Warn if none of documentation, homepage or repository are provided
It's really hard to find out any information about a project if it
doesn't have any of these.
As a bonus I added a shebang to .travis.install.deps.sh so the README
instructions actually work.
Closes #998
bors [Mon, 15 Dec 2014 16:13:53 +0000 (16:13 +0000)]
auto merge of #1051 : liigo/cargo/print-version-to-stdout, r=alexcrichton
e.g. docopt treat version (and help) as non-fatal error
Fixes #1033
Liigo Zhuang [Mon, 15 Dec 2014 06:17:51 +0000 (14:17 +0800)]
add test: cargo --version
Liigo Zhuang [Mon, 15 Dec 2014 00:41:43 +0000 (08:41 +0800)]
fix fatal condition
Liigo Zhuang [Sun, 14 Dec 2014 13:34:33 +0000 (21:34 +0800)]
print non-fatal errors to stdout instead of stderr
e.g. docopt treat version as non-fatal error
Fixes #1033
bors [Fri, 12 Dec 2014 21:13:52 +0000 (21:13 +0000)]
auto merge of #1042 : cgaebel/cargo/execute-main-with-custom-args, r=alexcrichton
Clark Gaebel [Fri, 12 Dec 2014 20:54:14 +0000 (12:54 -0800)]
Add support for a custom arguments list when running main.
bors [Fri, 12 Dec 2014 04:28:56 +0000 (04:28 +0000)]
auto merge of #1039 : alexcrichton/cargo/update-rust, r=alexcrichton
Alex Crichton [Fri, 12 Dec 2014 04:20:29 +0000 (20:20 -0800)]
Bump rustc version
bors [Thu, 11 Dec 2014 23:28:54 +0000 (23:28 +0000)]
auto merge of #1036 : brson/cargo/flakeywindows, r=alexcrichton
Brian Anderson [Thu, 11 Dec 2014 23:16:43 +0000 (15:16 -0800)]
Sleep before unlinking to fix a flaky test on windows
bors [Thu, 11 Dec 2014 21:28:55 +0000 (21:28 +0000)]
auto merge of #1034 : brson/cargo/rust-installer, r=alexcrichton
This is just a refactoring to put Cargo and Rust on the same installer script.
Brian Anderson [Fri, 21 Nov 2014 23:43:29 +0000 (15:43 -0800)]
Use rust-installer for installation
This is just a refactoring to put Cargo and Rust on the same installer script.
bors [Thu, 11 Dec 2014 19:13:56 +0000 (19:13 +0000)]
auto merge of #1022 : alexcrichton/cargo/std-thread-pool, r=brson
No need to have our own bundled implementation when the standard library
suffices!
bors [Thu, 11 Dec 2014 01:28:58 +0000 (01:28 +0000)]
auto merge of #1024 : alexcrichton/cargo/less-send, r=brson
Alex Crichton [Tue, 9 Dec 2014 18:50:06 +0000 (10:50 -0800)]
Remove lots of no longer necessary + Send annotations
bors [Tue, 9 Dec 2014 17:43:59 +0000 (17:43 +0000)]
auto merge of #1021 : alexcrichton/cargo/issue-986, r=brson
If manual modifications have been made or if cargo/rustc died for some sort of
error, then we don't consider a target as being fresh. If any of the files
output by a target don't end up existing in the target directory (even if the
fingerprint says they do), then we consider the target not fresh.
cc #986
Alex Crichton [Tue, 9 Dec 2014 04:24:27 +0000 (20:24 -0800)]
Migrate to std::sync::TaskPool
No need to have our own bundled implementation when the standard library
suffices!
bors [Tue, 9 Dec 2014 03:58:59 +0000 (03:58 +0000)]
auto merge of #1020 : alexcrichton/cargo/issue-885-round-2, r=brson
Don't return dev-dependencies as dependencies for non-test targets as they're
not actually dependencies!
Alex Crichton [Mon, 8 Dec 2014 22:50:16 +0000 (14:50 -0800)]
Rebuild files if target directory is corrupt
If manual modifications have been made or if cargo/rustc died for some sort of
error, then we don't consider a target as being fresh. If any of the files
output by a target don't end up existing in the target directory (even if the
fingerprint says they do), then we consider the target not fresh.
cc #986
bors [Mon, 8 Dec 2014 21:19:01 +0000 (21:19 +0000)]
auto merge of #1019 : alexcrichton/cargo/issue-991, r=brson
It turns out that the registry was being queried with git dependencies as well,
so this commit alters the core registry not query sources with dependencies that
did not originate from the source.
Closes #991
bors [Mon, 8 Dec 2014 21:03:01 +0000 (21:03 +0000)]
auto merge of #1018 : jakub-/cargo/cargo-search-api-token, r=alexcrichton
Alex Crichton [Mon, 8 Dec 2014 20:34:31 +0000 (12:34 -0800)]
Fix build scripts in dev-dependencies
Don't return dev-dependencies as dependencies for non-test targets as they're
not actually dependencies!
bors [Mon, 8 Dec 2014 20:16:19 +0000 (20:16 +0000)]
auto merge of #1009 : jmesmon/cargo/err-msg-fix, r=alexcrichton
Updates an error message
Jakub Bukaj [Sun, 7 Dec 2014 20:25:32 +0000 (15:25 -0500)]
Do not require an API token for `cargo search`
Jakub Bukaj [Sun, 7 Dec 2014 20:24:36 +0000 (15:24 -0500)]
Update to latest Rust
bors [Mon, 8 Dec 2014 19:36:21 +0000 (19:36 +0000)]
auto merge of #989 : jbcrail/cargo/fix-doc-spelling, r=steveklabnik
I just made minor corrections.
bors [Mon, 8 Dec 2014 19:19:38 +0000 (19:19 +0000)]
auto merge of #1010 : alexcrichton/cargo/mingw, r=brson
This prevents having mismatches between bundled libs and libs on the system
(Cargo requires MinGW to compile regardless).
Alex Crichton [Mon, 8 Dec 2014 17:04:19 +0000 (09:04 -0800)]
Bump libgit2 dep to hopefully fix win32
Alex Crichton [Mon, 8 Dec 2014 06:25:26 +0000 (22:25 -0800)]
Fix updating the registry too often
It turns out that the registry was being queried with git dependencies as well,
so this commit alters the core registry not query sources with dependencies that
did not originate from the source.
Closes #991
Cody P Schafer [Fri, 5 Dec 2014 06:54:33 +0000 (01:54 -0500)]
custom_build: build output goes in the directory for the req, not hard coded to Target
This broke crossbuilds that had Host deps that used custom build
scripts, typically resulting in a failure to link (due to bad
relocations or symbols) the final executable or library.
Probably should have rustc check when generating an rlib that all the
containing objects have the appropriate arch.
Alex Crichton [Thu, 4 Dec 2014 06:57:06 +0000 (22:57 -0800)]
Delete bundled gcc libs on windows
This prevents having mismatches between bundled libs and libs on the system
(Cargo requires MinGW to compile regardless).
bors [Thu, 4 Dec 2014 05:44:10 +0000 (05:44 +0000)]
auto merge of #1008 : jmesmon/cargo/custom_build_kind, r=alexcrichton
This is just to support some nice environment aliases in gcc-rs at the moment.
Cody P Schafer [Wed, 3 Dec 2014 18:09:46 +0000 (13:09 -0500)]
custom_build: add the HOST environment variable
bors [Thu, 4 Dec 2014 02:44:10 +0000 (02:44 +0000)]
auto merge of #990 : alexcrichton/cargo/update-blows-up, r=brson
This is the same as the fix for #951 (fixed by #965). The relevant code was
erroneously looking at the source id when it should instead look at the entire
package id (name/version/source).
bors [Wed, 3 Dec 2014 22:14:13 +0000 (22:14 +0000)]
auto merge of #997 : alexcrichton/cargo/issue-993-attempt, r=brson
If a submodule's head commit doesn't exist, then we should attempt to update it
rather than aborting the updating process. This commit moves a local `try!` into
a `and_then` closure to prevent returning from the outer function to hopefully
catch more cases where the submodule needs to be updated.
cc #993, but I'm not sure if this fixes it
Cody P Schafer [Wed, 3 Dec 2014 20:05:32 +0000 (15:05 -0500)]
We're cargo, not rustc
bors [Wed, 3 Dec 2014 07:59:15 +0000 (07:59 +0000)]
auto merge of #1003 : jmesmon/cargo/update-for-nightly, r=alexcrichton
I'm a bit shaky on the profile.rs changes (`thread_local!` and `RefCell` relplacing `local_data_key!`), do make sure I haven't royally screwed something up there.
Cody P Schafer [Tue, 2 Dec 2014 03:11:20 +0000 (22:11 -0500)]
Update for nightly
I'm a bit shaky on the profile.rs changes (`thread_local!` and `RefCell`
relplacing `local_data_key!`), do make sure I haven't royally screwed
something up there.
Note that I haven't sucessfully run the various test_cargo_cross_compile
tests as I don't have an i686-unknown-linux-gnu rustc sitting around.
bors [Tue, 2 Dec 2014 08:14:14 +0000 (08:14 +0000)]
auto merge of #1000 : jbranchaud/cargo/add-semicolon-to-hello-world-in-docs, r=alexcrichton
Both the `index.md` and `guide.md` files show the hello world program source
(generated by `cargo new`) without a semicolon (`;`) at the end of the
`println!` line. The file generated by `cargo new` does and should have a
semicolon. This commit brings the docs in sync with the generated code.
jbranchaud [Tue, 2 Dec 2014 02:09:44 +0000 (20:09 -0600)]
Add a missing semicolon to the hello world program in the docs.
Both the `index.md` and `guide.md` files show the hello world program source
(generated by `cargo new`) without a semicolon (`;`) at the end of the
`println!` line. The file generated by `cargo new` does and should have a
semicolon. This commit brings the docs in sync with the generated code.
bors [Sun, 30 Nov 2014 08:14:16 +0000 (08:14 +0000)]
auto merge of #995 : alexcrichton/cargo/issue-808, r=huonw
Closes #808
Alex Crichton [Sun, 30 Nov 2014 06:11:33 +0000 (22:11 -0800)]
Bump version number to 0.1.0
Closes #808
Alex Crichton [Sun, 30 Nov 2014 07:40:08 +0000 (23:40 -0800)]
Don't abort on possibly-corrupt submodules
If a submodule's head commit doesn't exist, then we should attempt to update it
rather than aborting the updating process. This commit moves a local `try!` into
a `and_then` closure to prevent returning from the outer function to hopefully
catch more cases where the submodule needs to be updated.
cc #993, but I'm not sure if this fixes it
bors [Sun, 30 Nov 2014 06:59:15 +0000 (06:59 +0000)]
auto merge of #996 : alexcrichton/cargo/issue-953, r=huonw
Closes #953
Alex Crichton [Sun, 30 Nov 2014 06:13:51 +0000 (22:13 -0800)]
Link logo to the main crates.io page
Closes #953
Alex Crichton [Thu, 27 Nov 2014 23:49:16 +0000 (15:49 -0800)]
Handle updates to version requirements in lockfiles
This is the same as the fix for #951 (fixed by #965). The relevant code was
erroneously looking at the source id when it should instead look at the entire
package id (name/version/source).
bors [Thu, 27 Nov 2014 20:59:12 +0000 (20:59 +0000)]
auto merge of #988 : Gekkio/cargo/zsh-run-normal-args, r=alexcrichton
Running a Rust program with some arguments such as files is a common use
case. The ZSH completion did not declare support for extra arguments to
"cargo run", so file completion was impossible. In practice pressing TAB
after writing "cargo run -- " gave no completion at all.
After this patch, cargo run can do "normal completion",
which in practice does file/directory completion. This works nicely
with "cargo run -- ".
Joseph Crail [Thu, 27 Nov 2014 20:57:30 +0000 (15:57 -0500)]
Fix spelling in documentation.
Joonas Javanainen [Thu, 27 Nov 2014 17:00:12 +0000 (19:00 +0200)]
ZSH normal completion for args in "cargo run -- <args>"
Running a Rust program with some arguments such as files is a common use
case. The ZSH completion did not declare support for extra arguments to
"cargo run", so file completion was impossible. In practice pressing TAB
after writing "cargo run -- " gave no completion at all.
After this patch, cargo run can do "normal completion",
which in practice does file/directory completion. This works nicely
with "cargo run -- ".
bors [Tue, 25 Nov 2014 21:59:15 +0000 (21:59 +0000)]
auto merge of #981 : steveklabnik/cargo/remove_color, r=alexcrichton
this version doesn't actually work. Let's make them real.
http://www.reddit.com/r/programming/comments/2mwidh/rusts_central_package_repository_is_up/cm8l8yr?context=3
Steve Klabnik [Tue, 25 Nov 2014 21:34:53 +0000 (16:34 -0500)]
remove references to color
this version doesn't actually work. Let's make them real.
http://www.reddit.com/r/programming/comments/2mwidh/rusts_central_package_repository_is_up/cm8l8yr?context=3
bors [Tue, 25 Nov 2014 17:44:19 +0000 (17:44 +0000)]
auto merge of #974 : alexcrichton/cargo/issue-940, r=wycats
This key will support projects with nonstandard licenses and the registry will
display the license as "nonstandard".
Closes #940
Alex Crichton [Tue, 25 Nov 2014 06:18:54 +0000 (22:18 -0800)]
Add support for a license-file manifest key
This key will support projects with nonstandard licenses and the registry will
display the license as "nonstandard".
Closes #940
bors [Tue, 25 Nov 2014 06:44:17 +0000 (06:44 +0000)]
auto merge of #973 : alexcrichton/cargo/issue-968, r=huonw
Closes #968
bors [Tue, 25 Nov 2014 05:59:18 +0000 (05:59 +0000)]
auto merge of #972 : alexcrichton/cargo/issue-969, r=huonw
Closes #969
Alex Crichton [Tue, 25 Nov 2014 05:50:14 +0000 (21:50 -0800)]
Print the right URL for `cargo login`
Closes #968
Alex Crichton [Tue, 25 Nov 2014 05:34:05 +0000 (21:34 -0800)]
Support documenting a selective package
bors [Tue, 25 Nov 2014 04:02:32 +0000 (04:02 +0000)]
auto merge of #965 : alexcrichton/cargo/issue-951, r=brson
When applying the lockfile to a resolve graph, we need to take into account that
the listed source of dependencies can change over time, in which case we cannot
lock to the previous version but instead need to continue onwards with updating
the listed source.
Closes #951
bors [Tue, 25 Nov 2014 03:44:51 +0000 (03:44 +0000)]
auto merge of #947 : alexcrichton/cargo/issue-937, r=brson
The logic for "not recursing into `target`" was pretty hokey and needed
replacement. This commit also unfies the paths a bit to ensure that the main
loop is the same part that adds the root package itself.
This reorganization ends up closing #937
bors [Tue, 25 Nov 2014 03:16:13 +0000 (03:16 +0000)]
auto merge of #941 : alexcrichton/cargo/issue-927, r=brson
Closes #927
Alex Crichton [Fri, 21 Nov 2014 20:31:00 +0000 (12:31 -0800)]
Clean up code around the crawling of a directory
The logic for "not recursing into `target`" was pretty hokey and needed
replacement. This commit also unfies the paths a bit to ensure that the main
loop is the same part that adds the root package itself.
This reorganization ends up closing #937
Alex Crichton [Fri, 21 Nov 2014 03:14:58 +0000 (19:14 -0800)]
Don't fail `cargo login` if `~/.cargo` doesn't exist
Closes #927
bors [Tue, 25 Nov 2014 00:18:58 +0000 (00:18 +0000)]
auto merge of #946 : alexcrichton/cargo/issue-933, r=brson
Some workspaces, such as windows, often have the home directory not in the
hierarchy of where projects live, which means that configuration may not work by
default. The home directory, however, is already singled out for `cargo login`
and it's pretty semantically special, so this commit ensures that we always look
at the home directory for configuration if it exists.
Closes #933
bors [Tue, 25 Nov 2014 00:00:54 +0000 (00:00 +0000)]
auto merge of #944 : alexcrichton/cargo/test-some-packages, r=brson
The `target` directory was erroneously being used from the crate root rather
than the root of the package directory itself, leading to packages not actually
testing what's precisely being published.
bors [Mon, 24 Nov 2014 23:34:34 +0000 (23:34 +0000)]
auto merge of #939 : alexcrichton/cargo/issue-38, r=brson
This ensures that the registry understands whether dependencies are build
dependencies or dev dependencies.
Closes rust-lang/crates.io#38
Alex Crichton [Fri, 21 Nov 2014 02:17:31 +0000 (18:17 -0800)]
Upload dependency kinds to the registry
This ensures that the registry understands whether dependencies are build
dependencies or dev dependencies.
Closes rust-lang/crates.io#38
bors [Mon, 24 Nov 2014 22:59:26 +0000 (22:59 +0000)]
auto merge of #936 : alexcrichton/cargo/issue-923, r=brson
Closes #923
bors [Mon, 24 Nov 2014 21:50:35 +0000 (21:50 +0000)]
auto merge of #919 : alexcrichton/cargo/issue-915, r=brson
Like the old build command, this commit adds support for executables run by
cargo (and tests) to ensure that `-L` paths for a dynamic library are added to
LD_LIBRARY_PATH after a compilation is run.
Closes #915
bors [Mon, 24 Nov 2014 19:14:30 +0000 (19:14 +0000)]
auto merge of #918 : alexcrichton/cargo/issue-912, r=brson
This forgot to take into account the logic from some other locations, so I added
a helper method!
Closes #912
bors [Mon, 24 Nov 2014 16:29:34 +0000 (16:29 +0000)]
auto merge of #959 : jakub-/cargo/cargo-search, r=alexcrichton
This will currently call out to the registry service. In the future it may be sensible to add package descriptions to the git index so that search can be done offline.
Closes https://github.com/rust-lang/cargo/issues/925.
Jakub Bukaj [Sat, 22 Nov 2014 14:36:14 +0000 (09:36 -0500)]
Add a `search` command to cargo
bors [Mon, 24 Nov 2014 02:29:34 +0000 (02:29 +0000)]
auto merge of #964 : carols10cents/cargo/patch-1, r=alexcrichton
I expected the comment about the whitelist to say where you could find the whitelist. This mirrors the information given in the error message if you specify an invalid license identifier.
I didn't make this a markdown link since it's within markdown within code within markdown, but I'm happy to edit this in any way you see fit.
Thank you!! :heart:
Alex Crichton [Thu, 20 Nov 2014 04:36:26 +0000 (20:36 -0800)]
Fix the root output directory when cleaning examples
This forgot to take into account the logic from some other locations, so I added
a helper method!
Closes #912
Alex Crichton [Mon, 24 Nov 2014 01:46:04 +0000 (17:46 -0800)]
Test source equality when locking dependencies
When applying the lockfile to a resolve graph, we need to take into account that
the listed source of dependencies can change over time, in which case we cannot
lock to the previous version but instead need to continue onwards with updating
the listed source.
Closes #951
bors [Sun, 23 Nov 2014 22:44:33 +0000 (22:44 +0000)]
auto merge of #956 : jakub-/cargo/newest-rust, r=alexcrichton
Jakub Bukaj [Sat, 22 Nov 2014 10:04:40 +0000 (05:04 -0500)]
Update to newest Rust
Carol (Nichols || Goulding) [Sun, 23 Nov 2014 01:02:24 +0000 (20:02 -0500)]
Point to spdx.org/licenses in license field docs
I expected the comment about the whitelist to say where you could find the whitelist. This mirrors the information given in the error message if you specify an invalid license identifier.
Alex Crichton [Fri, 21 Nov 2014 17:36:18 +0000 (09:36 -0800)]
Specifically look in the home dir for configuration
Some workspaces, such as windows, often have the home directory not in the
hierarchy of where projects live, which means that configuration may not work by
default. The home directory, however, is already singled out for `cargo login`
and it's pretty semantically special, so this commit ensures that we always look
at the home directory for configuration if it exists.
Closes #933
Alex Crichton [Fri, 21 Nov 2014 06:48:18 +0000 (22:48 -0800)]
Ensure crates are tested after packaged
The `target` directory was erroneously being used from the crate root rather
than the root of the package directory itself, leading to packages not actually
testing what's precisely being published.
Alex Crichton [Fri, 21 Nov 2014 00:08:01 +0000 (16:08 -0800)]
Don't require a manifest for `cargo owner` commands
bors [Thu, 20 Nov 2014 19:29:22 +0000 (19:29 +0000)]
auto merge of #922 : steveklabnik/cargo/patch-1, r=alexcrichton
Steve Klabnik [Thu, 20 Nov 2014 19:07:13 +0000 (14:07 -0500)]
fix capitalization in build script docs
bors [Thu, 20 Nov 2014 17:44:22 +0000 (17:44 +0000)]
auto merge of #913 : jmesmon/cargo/forgive-wierd-triples, r=alexcrichton
bors [Thu, 20 Nov 2014 16:29:25 +0000 (16:29 +0000)]
auto merge of #920 : CMGS/cargo/master, r=eerden
when I use this script in oh-my-zsh, it will raise an error, so I modified it..
CMGS [Thu, 20 Nov 2014 06:50:26 +0000 (14:50 +0800)]
bug fix for oh-my-zsh
Cody P Schafer [Mon, 17 Nov 2014 02:35:19 +0000 (21:35 -0500)]
dl-snapshot: be more forgiving to triples
Alex Crichton [Thu, 20 Nov 2014 04:48:32 +0000 (20:48 -0800)]
Put -L paths from scripts are in LD_LIBRARY_PATH
Like the old build command, this commit adds support for executables run by
cargo (and tests) to ensure that `-L` paths for a dynamic library are added to
LD_LIBRARY_PATH after a compilation is run.
Closes #915